maint.mk: more tight_scope improvements