[3970f54c4e]: Improved fix that is more tolerant of a single variable varname.