Some performance improvements.  Currently parsing at ~794,000 LOC / second.