Re-work changes to keep filesearch and loader simpler.