Got rid of inheritance from NonCopyable in favour of explicitly deleting copy members, converted all #ifdef to #if defined for consistency, implemented workarounds for VS2013 bugs.