Preparation for BasicBlock changes to support While/For Loop work