- Replace static SyncOnceCell with thread-locals, install & uninstall through block_on - Break runtime into own module