Add support for "with" - not yet working

Also update to newer compiler, and some consequential changes from
that (Makefile, includes, etc)