Partially complete QA/Refactoring of Corpse.