More work on location info in AST