Fixes to parallel composition and choice in initial dehopification phase

This pull request fixes two glaring bugs in dehopification for parallel composition and choice. The first being that in some cases, this code would replace the constructor for choice with the one for parallel composition. The second is changing a rule that correctly distributes terms across parallel composition and choice.