Minor code improvements on WrappingVariablesMap