[WIP] Fix a regression in settings_get_form_vars.

Fix a regression introduced by #954 that I missed when testing.