I think we should make those one liners:
`/** @var $handler \eZ\Publish\Core\Persistence\Legacy\Handler */`

The screen estate is a bit too big here, imho (that's what I do at least).