Support for multi-line class definitions, support for multi-line function definitions, fixed non-function collection white space when no non-function data present