Added expand() wrappers to clean up vimshell false ~ directory