Hub codebase review, part 2.