Eliminate byte-compile warnings