Another cleanup for `maint print architecture'

Committed,
Andrew