Implemented keyword substitution for XML params.
More postgres work