Fixed: Last commit was a giant rewrite!

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.