FIX: Parsing events

Just going to make sure Travis is happy, then merge.