The rain delay changes just got pushed! I have lightly tested this so please let me know how this is working for you.
By the way, @andrew please continue to submit trivial changes, they are actually very important. I think this change exposes auto-delay options to a wider audience. I also think it fixes the dialog problems with the rain delay option before. I never thought of bringing them together before you mentioned it.