Make sure N+1 queries are good and dead