Fix issue #40: separate out fix_execfile and fix_cmp