Good idea.  Went with Optional instead; it lets us be more careful about checking there's only one leader in future.