Imporved the function extractor for c-like languages.