Merge "TypeHelpers.h: Don't underflow unsigned int"