Make core playback events consistent

Fixes #629