Code cleanup.

Conflicts:
	test/fakefs_test.rb