Simplify label canonicalization
2 files changed