Update to attempt to alleviate confusion between Directory.new and get.

May want to have Directory metadata load only on #each instead of #2561. If so, we'll want to revisit this later. But this is a stop gap because of issues like #2714 coming up.

/cc @krames