Shoring up some variable-setting issues.