Here is a slight update so that type names are treated homogeneously between both added paragraphs.
ITSM that this patch should be committed without further ado.
-- Fabien.