Improve support for int variable evaluation