Separated combinators.
Got rid of some namespaces.