Remove dependency on stdint.h.
Bit of cleanup.
More fixes, more cleanup.