Eliminate the remaining have_fields calls