The dir vs non-dir test now assumes the dir wins.