Fix a few typos, omissions, and name mismatches that caused this file to
not compile.