Refactor compiling a selector
Remove pickWrapped/pick distinction