Another big pull of changes.

Seems we weren't done.