Rewrite handling of constraints
Tweak messages
Tweak notation