bugfixes:
  - Fix potential, but unlikely, cases of variable use before definition.