Minor cleanup to configuration.