More tidying old-style $wpdb->prepare calls