Fixes #678: Use the size getter to know if the Map is empty;