Don't quote staged_files and new_files.....

This will require several other changes before it can be done.
Merge branch 'misc_fixes'