Are you saying the PR in its current state works with Boot AND with legacy mains() ?

Then I'm in a favor of having another PR/story for the cleanup