Skip to content
Includes fixes and macro removals.