Support Close()

I probably didn't think this entirely through yet, but let's see
what happens.