second attempt at avoiding warnings at /W4 on vs2013

Another attempt.