WS-601: fixing potential sites of UnboundLocalError

Janet Goldsteinrequested to merge
WS-601-fix-ref-before-assign-err into main
  • fixed a couple potential (one actual) sites of UnboundLocalError
  • turned a few magic strings into constants

Merge request reports