Oops... Fix some code that was missed during refactoring.