Improved do-cd-bookmark and do-bookmark commands