Refactoring of parsing functions in progress.