orig full version 2nd pass to ch 1-3 (wraps <orig> with <choice> and <distinct>)