Change model accessors to return value rather than optional

This assumes that the value always exists, which it will once pre-populated models are injected into the constructors

Re #22263