Seems like we should resolve with a stat object here, not a FileSystemEntry.  OTOH, since this is only used in one place below, maybe we should just remove this helper and call resolve() there directly?