Expansion of aliases is working. Still need to restore the behavior of underscores...