Code cleanup for causal stuff.