r=adilger,johann

- handle log_cancel resent correctly;
- some cleanups in llog.