Change of algorithm to write (custom-set-* ...) in 21.5-b1?