Fixing bug recently introduced: we are now adding the ESI constraint to the canonical declaration, so we must also update it at the canonical declaration when we add the TBB related inclusion constraints