Update for revised Arena implementation.