That would change the keys in some cases, but I guess I've already broken backwards compatibility, so why not.