Fix bug in shift operator that doesn't always normalise when we should.

svn path=; revision=84795