Tweaks to help make jimsh0 usable to build using nmake. Does not quite work

yet, but getting closer.

FossilOrigin-Name: e911303b8d180897c256e5de6edaa6b99239f914b84de2d08b3410650cd52c6d