Replace certain dictionaries with objects

[Mark2000]

Opportunities should use objects with set keys instead of dictionaries. There may be other cases where there is room for improvement in this way.