I expect one could hide the complexity in the ARCHENTRY / ARCHEND macros, and have it apply to all architecture distinctions, like having ".text", ".text_scalar" and ".text_baseline". Yet, it still would increase complexity, and maybe the disctinction is not just scalar/baseline at all occurences, but also higher profile SSE/AVX, so text_baseline could again be subject to fragmented use.