Small clean-up in s.a.events.Events.consume_one
Small clean up in s.u.t.common