Add expand to ApplySubs().