I had forgotten about those types.

Not functional change (expected!).

This makes a lot of code safer.  We only try modifying the object in one
place, after making sure it's safe to do so.  So, do a const_cast<> in
that one place...

Avoids USHORT, SHORT, ULONG, LONG clashes with Windows API.

Should fix warnings generated when building with -Wunused-private-field.
Based on patch from Jonathan Kew.

More to come, for APPLY, CLOSURE, etc.

Oops!