Misc changes
Make Value constructors strict
Tweak rewrite rules
Rewrite rewrite code

Use bools and or instead of maybes