Putting the new reducer in another cleanup function.

This allows us to remove 9 other explicit rules.