Gittrac #2966:  a few more cleanups to the PRE_SKIP code.