Also fixes a typo and adds two missing nullability annotations. FossilOrigin-Name: 6307a381989719ad89067e1ae2cb5d454dd0b77a83cc6141785067365767e7f6