Cipher thread locals should be static
Fix some out of style formatting.