and clean up the mess around the two different Select methods
which just led to confusion in the overriding classes.

Change-Id: Iea0ea85752180d0dc50d2b4ddb3d861e8447fb0a