Minor code style fixes for apidoc
Fixes #2659