more quoting removal, some slight optimisations