Nudge: unify ASSTags some more