This really should be fixed, I think.  What's the minimal solution
for making this work better?