Followup on !682 (merged), I realized there might be a bit of a bug there. Mostly todo notes for now.