Handle variable names in plots better.