Few more combinators, cleanup