Fixed a laziness bug in ArrowChoice

Fixed a laziness/strictness/order of operations bug in Arrowchoice and
stepMSF.