More finally closures, may help with #3434