Rearrange some line to stop diffs in {Groovy,Generic}Script.execute easier.

Both should behave the same so spotting differences between the to
implementations should be made easy.