[PATCH 0/5] Some parsing functions refactor