hmwildermuth binja: Better instruction detection logic, removes bad workaround for…