opaque-keys fixes to make test_split_migrator work