Partial body resolve: added test for do-while
Partial body resolve: more efficient handling of while