Comment by BrenBarn

Fortunately there's a pretty obvious way to address both those problems at once. . .