Fixed problems in build_model_bax_schwarz macro

Hadn't been updated to use new monomer signatures, etc.