It is the right place, although a FIXME has been added about a possible future improvement.

Fixed in eb48236