Refactor tracking and parsing.