Remove full maker instance from targets

Just include the store now, having moved env into the store.  The
exception is cleanup targets that need to be able to call back to
the full maker object to clean.