a couple small bug fixes

The temporary mode change operators need a new caller that only has
side-effects, but returns the previous value.    Hmmm.    That will
require some thought.