Porting of modules

``choice`` cannot be null. Please also check that ``args.choices`` can actually be null too.