And back to tink_macro 3.x