The handling of demos has not been up to the same quality as the rest of the build. Worst of all is the use of non-named argument macros, which makes the macro calls very hard to decipher.