Clean up branch-through-zero warnings in simulation.