Refactor: Push event construction out.