Replace hard coded numbers with table access. Avoid comparing
values from different enums.

Change-Id: I43216db4a9b13ee317e8e517683946f526e5ca0e