More greenlet cleanups