Reduce the number of expandTag(..) call sites.