[WIP] Query constructor API changes

I... have no idea. I guess we didn't want to be pricks about wTimeOutMs?