Fix for handling of convention closures.