More changes related to f_enduse/intake moving to f_intake/wholesale.