Fix case where list elements are not strings, use better variable names.