Redesigned the handler close functions so that they are usable
at different places where waiting for closing tables is done.