Actually, no, there was broken stuff around this besides what you asked for to support existing practice.  This was good for making the new chunk stuff better.