Fixes to get the testsuite to build
Merge branch 'bgq-backend' of github.com:JeffersonLab/qphix-codegen into bgq-backend