Clarity fixes.