Even more PHPDoc improvements.

PhpStorm makes it so easy to find these issues. I won't miss you,
NetBeans.