Clean up circular mess between Configuration and ConfigurationBuilder