Find another way to deal with system dependent aliases.
11 files changed