Lots of improvements and macro removals. All requests route through http-perform now.