Support for folding c-style brackets.

Updates to the extraction and formatting code.