Moved where-typemiss code into destructure, from various places.