Switch some legacy calls out.