Make StringKeyed* more complete