Reorganize commenting to make precedence clearer