Ensure compilability with JDK 8
Avoid clash between static methods with 1 and 2 type variables. Ensure compileability with Java 8. MPS-20745
Ensure compileability with Java 8.