a few cleanups + asserts
Merge branch 'master' of github.com:chriseidhof/datalog-talk