Make paths handled more sanely.