More fixes for recent changes to the datatypes registry.