First round of expand cleanups.
1 file changed