Fixup nullary typeclasses (Trac #8993)