Followup to r86047: Rewrite the radio-button updater & move everything to action...