I noticed this while working on #380. I'd like to discuss this in detail in the spec, but also fix this in a common-sense manner right now.