More work on convenience classes.