FIXED: Argument order for closures changed.