Fix status-healing

This ought to take care of #6128 and #6153.  It's UGLY But It Works!(TM).