Could you switch to using quotes rather than `%q` and try to keep the under 80 columns, please?

Happy to merge once that's done.