Woot. An added benefit of this cleanup. :)