More error cleanup. Over 3,980 errors have been fixed sense the
start of the back-porting.