Support for new label/comment mappings syntax  (copied from Mohamed's uncommitted code)