Minor variable tweaks.