Merge "Refactor code related to I/O handles to reduce chance for leaks"