fix expand and expanduser. see comment on #88