Minor comment changes; committed in PHX