Minor code consistency fixes.