Improve PHPDoc return type hints