I'm not sold on the decorator scheme, but I do not think perf is an issue