WP-4247: clean up markup.