Follow-up r112424: Per IAlex on IRC: Use escape() instead of plain() for improved...