This will require making our "settings modules" non-static (which will allow simplification, anyway).