Code review: 181860043:  Fix for issue 42 and clean up.