This simplifies the code considerably, removing one of the last uses of hygienic matching out of resolution.