Done in be04674 (commit reference likely to change in future rebases).