Code review: 175320043:  More fixes for issue 27.