Treat if and elif equally

Both if and elif require a then keyword.

Change-Id: Id46b38f7a7bf31888405499f6c461b708e88abfd