More refinements and fixes.
Delete the Swift demo's App Delegate class:
It's not needed.