Address HD's other comments, fixes mismatched var name in last commit.