Some misc DiscIO code reduction and other varia.

Also unique_ptrs~