Fix #253 - Brought across original logic for finding the type and method info

Went back to history prior to all message changes.