Prefer enum value over string, to get compile time checking.

Prefer enum value over string, to get compile time checking. #2070