Markup and link fixes

The spec now cross references things that broke during migration to noLegacyStyle.