Some refactoring for Closeable implementors
Merge pull request #3109 from lutovich/closeables_refactoring

[master] Some refactoring for Closeable implementors