Replace com.sun.tools.javac.util.Pair by a fork of this class to solve some compilation issues