Add #include <cassert> as appropriate.
Address review comments from DM-70.
Improve comments to be more doxygen-friendly.
trailing whitespace fixes