Replace all version-selecting calls with single select()