wip: separate logic and settings for make-bundle etc macros