1. Remove compile errors in up-to-date gcc.