I had the same thoughts, but for now I think it's better that it's explicit and in our faces until we know it's right and a repeatable pattern.