r9249: separate target-slot processing in prep for rewrite to use single join statement