Refactor store query results to use variant member.