# rewire commentable and votables to require less passthrough parameters in dependencies