Partial fix for #2.

Lines 457, 463 are not yet fixed because I am not sure whether both/either of the arguments to html5_shortcode_demo() and html5_shortcode_demo2() are being passed.