Finish formatting most of the Extract based cpp files.