Bugfix
   * Stop using reserved identifiers as local variables. Fixes #4630.