Add more canonicalizations