Some more PHPDoc clean-ups.