Reduce use of LFN2PFN call.  #4231.