Minor code improvements on WrappingVariablesMap
Updated ChangeLog.