cleanup some of the nasty code in the PactBodyBuilder