Minor fixes to tag formatting (again).