Migrate choice statement implementations