model: fixup happens_before/reflexivity, add 'curr' to lists earlier