Guava shading fixes for eclipse and IntelliJ