done (and another fix nearby to add a ``:func:``)