[PATCH 0/2] Simplify settings save code