While at it, rename that to ExpandImpl() so it's unique.

Change-Id: I217deb72b4dfdca777e28e18ff56e49863e66640