Added macro expansion to show_custom_vars