t6038 (merge.renormalize): style nitpicks