Refactor: extact wraith stuff from VerifyCommit