STMX-PERSIST: ABI cleanups