Cleaned up markupparser(n).