Respond to hounds in yesterday's PR

Lots of single quotes and hash updates.