Fixes after code review of cmm arithmetic optimisations