Given that we're not imposing any font-type restrictions[1] in the non-/FontDescriptor case, it's not really clear to me why we'd actually need to do that in the general case. Please note that there's some *expected* movement, all of which should be improvements, in the `fips197.pdf` file with this patch. --- [1] With the exception of Type3-fonts, of course.