Fix a number of broken ADL 1.4 archetypes.