GRECLIPSE-1396 Initial fix is broken as declaring class for Parameter is null now. Changed for origin type.