(maint) Spacing fixups