Remove diagnostics and attempt to work around VC compiler bug :-(