Clickfs exclusivity correction

The earlier commits are cleanups; the money's the last two.