Removed all traces of node scavenging and refactored macro interface.