Now the latex output matches the hand-edited "canonical" version.