RPC callbacks refactor
Don't clobber over the event emitters _callbacks