Improvements to reachability support.