Fix problems with STRICT and WITH

There are probably others that should be fixed as well.