eclipse/transit choice implementation changes