Cleaned up Mac Demo, reducing SLOC, clarifying, etc.

Also fixes an erroneous Xcode "validation" warning.  All functionality retained + tested at 100%.