Make standalone catenation order well-defined

This avoids dependency issues and lengthy diffs.