There are some parts of these two selection models that can be extracted out into a single helper class to avoid duplication (and the introduction of partial fixes).