(...and then refactoring the repo to actually match the expectations...)