Improve a bit further towards actual parsing.