Small refactor: ensure parse_* func consistency
Merge branch 'master' of github.com:atc-/cfr