Fix a few byte-compile warnings.