Fixing possible bison issue related to reentrancy.