The reviewers stuff probably could've been its own commit, but I like the changes. I'll mark a TODO to trim this.