Gittrac #2966:  made a few cleanups to the PRE_SKIP code and the
corresponding test.