Two patches related to fixing the way contexts render (implicit params and equality constraints)

You can cherry pick them or just merge them both, up to you. I'm fairly confident both are sane.