While the thought of dealing with this codebase makes me reach for the Benzodiazepines, I might as well clean this up.