Add expand behavior
handles $$, $? $name and ~