Can we pass KeyValueBuilder through the PTable.newRow method instead of storing it here? I think we'd have a PhoenixConnection in all those places, so we could pull it out from there. An even better place to put the KeyValueBuilder would be on QueryServices which is accessible from a PhoenixConnection, but a singleton.