PIVOT-1032: Fix the "AvoidNestedBlocks" style errors, as well as many other errors in those files (mostly FinalParameters).