Diced up to per-scenario pickling for sanity. Still, there must be a better way...