Minor consistency cleanups.