Updated macros helpers (allow compilation under MSC 2013)