Fix remaining WORD / UWORD issues
Merge remote-tracking branch 'mhansen/trunk' into flint-2.4