Inserted code into analyzer for optionally including barrel events.