Byte-compile cleanly without wrapping code in eval-when-compile

This seems to do the trick. :-)