Begin to decouple WhileStmt from use of BlockStmt::blockInfoGet/Set