Minor improvements to Super API.