Refactor a few selectors so that the least specific ones are first.