Prepare for xcode analyzer support -- more care with PreTokLoc use