Did another pass on macro internals