I yield.  Going with `unset CDPATH`.  May the odd user this affects forgive me now.