Safer MergedProperties.entrySet implementation