tyxml camlp4 fixes

followup to #2075