If anyone wants to argue that patch 1 belongs in anaconda's custom spoke, I'd be receptive to that idea. Seems like six on one side, half dozen on the other to me. Patch 3 is a minimal version of patch 8 from the set I just sent for master.