Remove some repeated-query funkiness