Fix up some old review feedback.