more code review comments - reorder field and clarify deprecation comment
revert 08c40af, keep isTopLevelApp, but suppress it in cases where it's obvious