Decorate Command Executor cleanup and Maff changes.

Signed-off-by: Michael Howe <mike@mcsnetworks.com>