This will make the parser a little more clear, and it may eventually allow us to provide a fast wrapper for sparse queries.