Refactoring to fix things broken in previous commit.