Slightly cleaner macro bootstrapping