fix #1131, now treat int local vars like data within expressions