Fix an issue introduced by the new with() stuff.