delint, and more comments.  Also, slight namespace cleanup as part of delint