Use `@return self|null` and re-add the property descriptions