Markup updates towards v3.1.0.