[WIP] Query constructor API changes

I believe I mentioned this in IRC, but there's no plans to change the terminology. Shouldn't really be much of an issue here, since we're not forcing users to write out the name of this option.