Edits to make GCC happy.