ISPN-4528 Genericize remaining M/R internal classes