Clean up main SourceParser.Clang file
Minor hlint fixes