Cleaning up executer command pattern generation to be correct again (try 2).