Better handling of late-stage reauthorization. GCal.getPrimary call moved to on-demand