Fix a couple more shellescapes.