Simplification

I'm sure the contraction logic is right, there are just exceptions that
make things really hard now.