Use explicit class for dynamically resolved context services (Issue #1079)

Instead of using LazyRef which is perhaps too general and fails to get across the semantics of what is going on.