Miscellaneous PHPDoc and parameter mess cleanup.