(maint) Mostly pass lint