What I would really like is to be able to is somehow roll the getting of the context and the on demand context into one, something along the lines of      *public* *boolean* resolve(Controller controller)    {       *boolean* previous = resolved;       ControllerState state = dependentState == *null* ? ControllerState.INSTALLED : dependentState;       ControllerContext context = controller.getContextAtStateOrEnableOnDemand(iDependOn, state);             *if* (context == *null*)       {          resolved = *false*;       }       *else*       {          addDependsOnMe(controller, context);          resolved = *true*;       }    }   That way we only query for the context once instead of twice (three times before my last change)