This a more robust way of handling comments for mask as this work with
no comment or multi comments (not that it should happen but it's cleaner
anyway)