Save eip status while updating state.

This fixes https://leap.se/code/issues/5556