Improved testability.