More refactoring, now failing because context has been released.