Some refactoring in prep for multi-escape analysis
Some refactoring in prep for multi-escape analysis

guoyiteng/braid,cucapra/braid,cucapra/braid,guoyiteng/braid,cucapra/braid,guoyiteng/braid,cucapra/braid,cucapra/braid,cucapra/braid,guoyiteng/braid,guoyiteng/braid,guoyiteng/braid