WIP Ir_commit compiles again