Minor improvement to nav model building.