Reduce downgrade rules

Reduce the number of downgrade rules.
Include this in the big (foo|bar|baz) above?