jira 2963 & jira 2965

I am not sure if I have the right idea ( attempting to load a targetClass from the type registry in getArgumentData.) I welcome feedback. Thank you!