FS#9157 - Tidy up some MAS35XX constants