Small refactor.
Can now include "extras" when tracking an event.