Getting rid of path-tomfoolery.