Minor changes from analysis of code.