nit. Remove XXX -- if this is a real problem, either fix it or file an issue. Or just change the comment to something like "It'd be nice to refactor so as to provide the bare fn types instead".