Take care of a few byte-compilation warnings.