vars flattened, was needlessly complex. in the end it was a facepalm that gets us to the next bug. lots of cleanups on the way.