(maint) Style fix-ups