Cleaned up configure.