Tons of commits and refactorings to polish cram-pr2-fccl-demo.