ntreg.h: short -> uint16_t, clean up whitespace