Minor cleanup/documentation while I remember.