Index: src/Common/ScopedMap.h
===================================================================
--- src/Common/ScopedMap.h	(revision 21a2a7d9c6395caabfb563f85756ba506c922512)
+++ src/Common/ScopedMap.h	(revision ccb29b47c00459e5bfba87f0eed380b3e7f121e2)
@@ -170,5 +170,6 @@
 	size_type erase( const Key & key ) {
 		for ( auto it = scopes.rbegin() ; it != scopes.rend() ; ++it ) {
-			if ( size_type i = it->map.erase( key ) ; 0 != i ) return i;
+			size_type i = it->map.erase( key );
+			if ( 0 != i ) return i;
 		}
 		return 0;