Dictionaries need String values for keys The cleanup patch earlier mistakenly used raw names as keys to the dictionary (such as one would do in a function call). This fixes that mistake. Patch by: Sverre Rabbelier Reviewed by: to-be-reviewed