added combinator helpers and refactored minimal slightly to use them