Yeah, the logic here is a bit funky because I just build a list that flattens entrypoint and normal entries. It's ugly for now - this should be much cleaner once we remove entry points of course :)