Move comments at the top of the grammar so they can surround markup