Fixes, death refactor.

Someday I'll start replacing them when I see them without having to be told.