Minor fixes to eliminate byte-compiler warnings.