Minor changes to allow both IAR and g++ build to succeed.
Note also that nodeDo was dropped. That has been replaced by nodeWhileEval0.
There is a corresponding motor repository submission for the IAR build.