Fix inconsistencies in disallowed mods and remove some trailing whitespace