A little bit of cleanup.
Fixes #199.

I would gladly remove '-skip' if I knew what to replace it with.