Clean up after ugly merges <shudder>

Tried to do things last minute and screwed things up.  Ugh.  This
'fixes' it.