Address code review comments.
Merge branch 'unknown_enumerators'