fix #4461, fix #4467: esm evaluation fixes