Add WORD-movement and remove '=' omap side-effect