Added more c*r macros.