A bit more doxygenization.