This is very awesome.  It's also very lazy.  I'd get shot for checking
it in as it is.  We'll merge it back upstream later, but I'm still at
the rapidly moving things around stage for now.