More work on the AU base classes.