Relatively minor changes to support new functionality.