cmd buffer. Also move some closure diagnostics to avoid interleaved output (no functional change, just better encapsulation). [SVN r79341]