Add combinators, port tests.