I prefer (1) and (2).  I think the behaviour this PR currently implements is good - it doesn't break existing hosts and automatically picks up the change when required.  I can add a note to the setting in the manual and file a related ticket on merge.