Fixed VS2008 compilation after those huge changes.