Not terribly important, but probably should replace the name.arch in these comments with something like "name arch" since we don't allow '.' in keys.