Add wdiag to -ng, closes #709