Re-order things around so that byte-compilation is happy