Push close event handling down
Convert constructor argument to accessor