Another change related to single vs double quotes, and a random attempt at another fix.