Bug 1131: Convert non-semantic markup to semantic markup