Work on canonicalizing the AST so our analysis can handle fewer cases