WP-4010: update markup around title.