EMI: Make sector name comparisons match GRIM and EMI. Fixes #873 and #895.