Add: a few minor fixings/improvements to the handling of type holders.