Be more uniform about style.