Minor cleanup of RoundRobinStrategy