Cleaned up merge leftovers. Made entryPath check more inclusive.