Stop using Either, removed in mozilla/rust#11149
Remove tuple-struct derefing (mozilla/rust#11188)