Move to a proper shared stack, instead of per-BC stacks
Concept cleanup