Fixes for doxygen errors.

Doxygen errors that are regression from 3810596. Went in because
I didn't have doxygen installed.