Derp, sure enough. I'll remove that top one.

Thank for the in-depth code review, I'm going to be cleaning up and responding to all of your line comments.