8072383: resolve conflicts between open and closed ports

Refactor close to remove references to closed ports

Reviewed-by: kvn, simonis, dholmes
28 files changed