Tweak the mangler; fixes trac #2871