Editorial changes from review to Core changes by Mike Miller.