First pass integration of the fix from Peter Bex for mtconfigf eval. Not quite working yet...