Markup cleanup.