Fix for handling more verbose "movw".