Improvements to refresh code to be more selective of where refresh is
necessary.