Simplified parser a bit.