Use ugly hacks to fix some quoting issues