Handling of macros looks much better now.