Use 16bit int type for static size variables for compatibility with clang's loop unroll pragma

Should hopefully address clang build issues in !2030 (merged)

@cattanem can a test build of this be run ? I have not tested it locally with clang, only gcc.