I'll be on reduced availability tomorrow until Wednesday. Y'all feel free to merge or coopt the PR as needed.