Additional phpdoc-related updates