Move out client macros.