My assumption is that many of my __MOJOSHADER__ blocks will be formal parts of
upstream Lemon, so I've merged over for now, removing the #ifdefs where
appropriate.

I'm keeping %expect support for now, even though drh didn't like the idea,
since I can't wrap my stupid head around the parser conflict resolution
process yet.