Various updates to make use of new functionality.