syntax: move callee_id into the expr_ variants