Yet more fixes for double relax.