Don't evaluate initial value unless the value has changed.
This covers Bug #2320