Tidy up tt.h

Backport some non-functional changes
found working on 'dense TT' patch.

No functional change.
Fix a warning with Intel compiler

warning #2259: non-pointer conversion from
"int" to "int16_t={short}" may lose significant
bits.

No functional change.
Merge remote-tracking branch 'upstream/master'