Fix #13 support for CiviCRM 5.73

bgmrequested to merge
fix573 into master

(and apparently I had forgotten to push other commits from my local master branch)

Merge request reports