Fix a couple of derps in the last merge.