Switched to modern dispatch/serialization calls.