ENH: Implement Yarik's suggestions.