Minor dorian systest cleanup.