Add checkargument and checkstate expressions