Little tweaks. Some concatenations are still erroneously quoted, but that can be easily worked around for the time being with the 'unquote' built-in.