Refactor handling of @covers and @uses annotations