Modernise and fix (ancient) "maurice" demos.