Finally simplified the derived functors stuff.