jshn: fix some variable handling regressions