ed190ad06a
and using it when appropriate. Merge analogue of the r195836 optimization to XEN. Approved by: re (kensmith)