Adds extra returns to closures for Go 1.0