tweak output formatting for consistency
consistently use double quotes
restore long-missing bit of dedupe