Refactored core parsing system.