Remove event type from close handler, fix last test.