Make assignments from closures in normalization pass