Bug 23221: (follow-up) Add comments on markup structure