Clean up formatting
Use an enum for the instruction type and flags

Better than preprocessor defines, since you preserve the variable names,
which can be especially valuable during debugging.