Align highstate output

Fixes #15418