Drop use of GenericsUtils.alignGenericsTypes for improved generics resolving