Significant changes from @jayvdb's efforts related to switching to the correct I/O classes, plus others similarly recommended.