Previous refactor #201 left behind some small bookkeeping that really should have been factored out. This does that, in the pick function. Pick now returns a boolean (as before) and also takes an in/out parameter of the selection code which is the actual pick result.
Two small changes here.