Be slightly less inefficient...
Basic testing to ensure we don't try to count binary files that are actually binary.
Hoist concern to avoid inconsistent behavior.
Ditch spurious require.