I have a patch for that. Maybe I'll add it to the next round after rebasing it. I had a feeling this was ugly.