Get rid of either-unwrap dependency and use fewer non-total library functions
Unnecessary style changes

I don't really know why I felt the need to do this, but I am happier
now.