Improve an integer select optimization in two ways: