Some generic clean-ups. Also make the StringMapEntryInitializer specialization apply...