Fix some warnings on VS2013 /W4

Minor fixes/disables to compile warning free on VS2013 at /W4.
Sorry for the slow response. The problem wasn't that I get 4127 (conditional expression), it's that I still get 4100 (unreferenced formal) i.e. the macro doesn't do anything. This is still the same at current head.