Associations: DRY up the code which is generating conditions, and make it all use arel rather than SQL strings