Preparation for source-or-execute, add an EXEC flag to detect the difference
Possible structure of dispatch
Better dispatch casing