Macros

Some refactoring using the ->> macro.