less trivial speedup target
Merge branch 'master' of github.com:tromp/cuckoo
merge away