This changes fixes a bunch of CodeReuse/ActiveRecord violations and make
the queries much easier to understand.