Add line numbers to AST, remove the need for canonization. Helps solve #2