Fixing some byte-compilation warnings.