Remove some special-casing that papered over bad markings.