small cleanup in _createContext