More optimizations to User::saveOptions()