RF: making wheel-upload a little more general