Simplified pipe operators, fixed edge case markup issues

Added Escape text to <c> and XText rather than applying to the whole
output.