Subbatching use new config

Updated @fourk's emergency-fix branch with subbatching to use new config access pattern. I also figure it probably should be merged into master before we forget about it.