One more round of cleanups, plus finally make it so QA staff can successfully run vest -c. w00t