Fixed parser and cats conversion in order to allow cast between generic inner classes Reviewed-by: jjg