Use uint16_t instead of uint32_t for nibble tables.
Cleanup.