Some refactoring.
We only want one event per message parsed.