Fixed old Riemann demo so that it compiles with recent versions.