Restructure policies slightly and add round-robin.