No more macros; config specialization instead