Backport 120813 from trunk (don't crash when using Expressions in Worklists) and add missing log of previous change