Fix up divergence with JuMP master