Clean up enum keyword macro and add as_str (#5788)

Clean up enum keyword macro and add as_str (#5788) #2518