I'm happy to report that EMP v2.3.1 integrates successfully with zc156 and later! It helps that there are no core-file overwrites.