Upgrade to 1.8.1: So long, metamorphs!