Fix for issue #543.

Immutables are constant values, too.
Merge branch 'master' into merge-2.064