More PHPDoc cleanups