Clean up parser header further