Updated new selector engine

The new selector engine had a few performance problems so an update was
made to remove some choke points and optimise the flow, at a small cost
to code size.