Various updates to support parser definition analysis.