Minor changes from my final read-through.