More refactoring for containers and combinators