Typos, better assertions, dead code