MapBuilder: replace check{Key,Value} with checkEntry

We may want to check that the key/value pair makes sense.