Add more // coverity[dont_call] comments