More work on cipher_migrate, still unusable