More comment/paramater/debug log cleanups.