Comments, whitespace, use ZMACRO_Has_tr1_early.
Conform to CF change elsewhere.