Clean up generated files added in r233250.
Fix declarations to slightly increase WARNS level.