Fix additional missing API doc tags.
Make PHPCS build passing again.