Fix some method calls that got missed during refactoring in the previous commit.