Clean up some shell code and M4 quoting

Authored by DemiMarie on Jan 20 2017, 3:49 PM.