I can see advantages of each variant, but we should decide on one and not implement both. I would merge it as it is, but if you want to change it, go ahead. Please give us a hint when it can be merged.