Code review: 175990043:  Clean up and fixes.