Fix up some of the parsing for the various marks.