cosmetic changes requested by Hadley and Yihui. Should be ready to merge from my end.