Reland "More entrypoint handling cleanup."

This reverts commit 8cedd8b45854cb971510a435909573a5855092d2.

Reason for revert: Fixed test

Change-Id: I551912891b65cac9927dcdb89033113f290d913c
9 files changed