Experimentally added with-renaming macro