Another 16-bit-cleanliness fix (and for once I spotted it before James!)

[originally from svn r8806]