Fixing local and global assignments to adjust expression list