#10124: Improve attribute hints