Minor cleanup for sorting AVs