 another update to RFD 26 to fix issues raised in recent review
 another update to RFD 26 to fix issues raised in recent review

melloc/rfd,davepacheco/rfd,joyent/rfd,AnthonyMann/rfd,davepacheco/rfd,joyent/rfd,rmustacc/rfd,davepacheco/rfd,davepacheco/rfd,melloc/rfd,davepacheco/rfd,joyent/rfd,rmustacc/rfd,joyent/rfd,melloc/rfd,AnthonyMann/rfd