Adjust outdated aCC6 workarounds (http://article.gmane.org/gmane.comp.lib.boost.devel/150572, thanks to Boris Gubenko)