Finished first non-optimized parser definitions. Testing required. #7