Fixed parsing for includes to elide program construction. Minor cleanups to examples.