Rework Session.expand in anticipation of wildcard expansion