Fix stateinformed.Die and minor cleanups