1. More comprehensive after-all handling. Specifically, the pass now handles after-alls with non-zero operands.
1. More comprehensive after-all handling. Specifically, the pass now handles after-alls with non-zero operands.
2. Add a case for merging two TupleOrToken labels. This case can arise when merging labels for multple conditional branch computations as they often return tuples.

Added tests for both these fixes.
