Made Markup into an atom.

ContextMark is now the only class that inherits directly from Mark.