gas more enum casts

Remove more unnecessary enum casts.
10 files changed