Implement some suggestions from inspect.