Minor mixup cleanups.