Committing prior to removing index.
Completed refactoring to remove lots of use of a separate index from Parser.