Unify some tagging and formatting.