Minor style cleanup for consistency (redo).