Simplify out the need to know the CWD.