Propagate scope to thi-switch cases.

This fixes evaluation of scope variables within thi-switch-when and -else blocks.