Fix #690: Cleanup launcher creation and class name tracking
Merge pull request #693 from gzm0/fast-fail-multi-main

Fix #690: Cleanup launcher creation and class name tracking