move around ExpressionStatement and CompoundStatement specs