Canonical bases in tensor products revisited