Add `catch` and `elseif` keywords