Merge live hacks from r83992 to trunk, after cleaning some things up.