Added first attempt at "expand" definition simplification.