Cleaning up the ActorRef serialization according to review. See #3137