Put locations in AST, not location info objects