Get rid of two deprecated (and actually broken) flags.