Minor macro and async additions.