PIVOT-1032: Fix the EmptyBlock and NestedBlock style errors in "core" (that is, non-demo or tutorial) classes.