Fix plenty of C4 warnings.