This is a good version. Several commit before this one were mistakes.

Revert "normalisation of expressions"

This reverts commit fe861e117c15ae9df3c918f4cf3a57bbae7532f2.