Add HLS support to simple variant of demo app. Plus cleanup.