Refactored VOSelector out of various places.