Fix the build from r356113.

Types had changed from when the patch was first created, and a final build
was not done pre-commit.