Fix direct execute() calls

This is a sweep of the codebase that checked calls to `execute()` with made directly on a class name.  Each instance was handled in one of a few ways depending on what I thought best matched the style of the containing module.

Need to check merge_cmd exists.