Improvements to configuration parsing.