r1668: :types improvement