Tweak the negative-ordinal fix to one that is a bit better.