Review fixes and fixed so that outline won't get stale AST values