Spec: Getting things to compile after Bikeshed changes.
Demo: Fixing the demo. :(