Bugs where we were still using some i's

Since order is noew determined by the queus and stacks, i's are
completely invalid and are only used for counting where in the cycle
we are.  activityNode->taskNumber is always a reliable indicator of
which task we are currently changing.