Ensure random_source_descr does not get out of sync with
No you didn't miss anything. Bug in my forward porting of this change from just before r324393 to after. I'll upload an updated diff. With r324393 we can still have the r260847 & r303035 bugs.