Add lint friendly assertions