Fixes for case 543511 - object comparison fails in eval()