Moving DREM comments to TODO.
Simplifying the generic logging calls.