Better refactoring of the HrXmlGateway to simplify the a la carte invocations.