Eliminated use of pushd/popd.