Refactor configuration options

Simplified by eliminating unnecessary delegation (that confused rather than clarified), unnecessary processing, and odd combos of method calls and iterators.