Fix some issues with parsing generics. In particular we want to support extracting argument/return value for things like List<String>