See note about refactoring above.