Clean up with new debug flags and gcc.