Make use of config parameter in config helper functions

This completes what 0678dc5ff70d8f84c84a37cb2dedc688ba28610b started.