ZS-85: BugFix crash on clang-generated binaries

A function that was checking supposed to be checking the entry point of a function was
checking the entire function.

Also included is a memory leak fix that now uses unique_ptr,
and some removal of commented-out code.