Add EXPECT and SPAN.
Reformatting.