Remove calls to blockInfoGet/Set via a pointer to a WhileStmt