Doxygen comments, part 2 [ci skip]