More Hocon refactoring