Fixes #594

This was already partially fixed, ``expandTilde`` was the missing piece
from perfection.