Partial transition to emit/callback format