Improve print_macros