Fix some word/variable resolution issues that make throf inconsistent.