Minor improvements to RHF.