Interim work on CHOICE encoding