Rework r187192, to tweak expressions to be tolerant of DOSish paths. XFAILs can be removed.