Remove superfluous quotes and commas in dictionaries

fixes #6687