Removed integer specific evaluations in favor of numeric checks.