Removed premature checks and availability tracking from parsing phase.