Added in a couple more combinators.
Minor refactoring.