Cleaned up compile-time configuration flags.