Suppress cast warnings
Covariant overrides for Scenario members
Use getter instead of deprecrated public field
Add missing comment
Suppress non-applicable warning
Tidy, refactor
Add "Provider" interfaces to ...Sets. ...Maps can also act as providers, returning themselves.