Update handling of the now listy Documentable.subkind