Remove some uses of currentStatementIndex where it is safe to do so. More remain.
Remove some uses of currentStatementIndex where it is safe to do so. More remain.

Polymer/tools,Polymer/tools,Polymer/tools,Polymer/tools