Cleaning up mess with arguments of print_values
Drop unused #defines