Fixes to make 'no-ec' work (it should not turn 'objects' into 'objts' for example)