Rearrange AV_[RW][BL]*() macros