Expand RETURN * to use actual identifiers as a rewriter