Correct event binding and update api.parse call

Follow up on Niklas' comments from I13da35cf.

Change-Id: Ieecfdd8cb2ad251358e6c542321c42b42d41ee4c