New keywords can now simply be added to a static array rather than
adding a new "else if" blocks for each keyword.

Change-Id: Ib581b3e834a57e0dfa9d139bcb4ae7a0a52a5472