Make makeKeyInternal() limit more conservative