Bo Bichette gets uneventful return to shortstop as Mets plan for emergency scenario