Take keywords changes into account.