Add checks for arithmetic and unrestricted variables