Make step function selection cleaner (in possible preparation for ping-pong loops etc).