Fix things for real this time.

Bash quoting is hard.
Merge pull request #1738 from jbeda/clean-fix

Fix things for real this time.