Smaller cleanups
Compatibility with the latest super closure version