Unify some things between shells