Added Map and OrElse combinators.