Also Deprecate the old unverifiable types.

[#1145 state:committed]