Oups, some renaming of variables was a bit too brutal. Fixed.