Some cleanup in ++auld.