WP-3558: update markup and periods.