@kaelig Good point.  I've put the OAS switch around the OAS slots as well now.