Probably, but I was trying to keep it consistent with the current way it works. This else will go away once 2.1 is released, and be replaced with a 2.1 "when" section.