Removed more whitespace and replaced uchar with unsigned char to make buildbot happy.